From: Keir Fraser Date: Wed, 3 Mar 2010 17:40:22 +0000 (+0000) Subject: Fix domain exit actions that contain hyphen X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12547 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=ad709c500b91259d8557fcb8232dac7629756b75;p=xen.git Fix domain exit actions that contain hyphen Domain exit actions that contain a hyphen (e.g. rename-restart) were not being detected properly when xm is configured to use xenapi. Domain config containing on_crash=3D"rename-restart" results in xen53:~ # xm new /tmp/domU.config Using config file "/tmp/domU.config". Unexpected error: This patch fixes the raised exception and at the same time handles the replacement of hyphen with underscore properly. Signed-off-by: Jim Fehlig --- diff --git a/tools/python/xen/xm/xenapi_create.py b/tools/python/xen/xm/xenapi_create.py index e56be76393..f53a1770fd 100644 --- a/tools/python/xen/xm/xenapi_create.py +++ b/tools/python/xen/xm/xenapi_create.py @@ -664,11 +664,11 @@ class sxp2xml: = get_child_by_name(config, "on_crash", "restart") def conv_chk(val, vals): - val.replace("-", "_") - if val not in vals: - raise "Invalid value: " + val + lval = val.replace("-", "_") + if lval not in vals: + raise ValueError("Invalid value: %s" % val) else: - return val + return lval actions_after_shutdown = conv_chk(actions_after_shutdown,\ XEN_API_ON_NORMAL_EXIT)